projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 642f16e 6830ddb)
bitkeeper revision 1.1159.1.453 (41a5e7c7aJTk6U0vlkPKrqp3fW71mw)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Thu, 25 Nov 2004 14:10:15 +0000 (14:10 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Thu, 25 Nov 2004 14:10:15 +0000 (14:10 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen.bk-smp
into arcadians.cl.cam.ac.uk:/local/scratch-2/cl349/xen.bk-smp


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.